Autogenerated HTML docs for v1.7.9-rc0
diff --git a/git-config.html b/git-config.html index 8911c7b..9fd70b3 100644 --- a/git-config.html +++ b/git-config.html
@@ -3118,6 +3118,22 @@ </p> </dd> <dt class="hdlist1"> +gpg.program +</dt> +<dd> +<p> + Use this custom program instead of "gpg" found on $PATH when + making or verifying a PGP signature. The program must support the + same command line interface as GPG, namely, to verify a detached + signature, "gpg --verify $file - <$signature" is run, and the + program is expected to signal a good signature by exiting with + code 0, and to generate an ascii-armored detached signature, the + standard input of "gpg -bsau $key" is fed with the contents to be + signed, and the program is expected to send the result to its + standard output. +</p> +</dd> +<dt class="hdlist1"> gui.commitmsgwidth </dt> <dd> @@ -4453,10 +4469,10 @@ <dd> <p> Activate recording of resolved conflicts, so that identical - conflict hunks can be resolved automatically, should they - be encountered again. <a href="git-rerere.html">git-rerere(1)</a> command is by - default enabled if you create <tt>rr-cache</tt> directory under - <tt>$GIT_DIR</tt>, but can be disabled by setting this option to false. + conflict hunks can be resolved automatically, should they be + encountered again. By default, <a href="git-rerere.html">git-rerere(1)</a> is + enabled if there is an <tt>rr-cache</tt> directory under the + <tt>$GIT_DIR</tt>. </p> </dd> <dt class="hdlist1">
